The best way to work around this is to use clone fields. You create a field group for each layout, then move all the fields in the layout to the new field group. Once that is done you create a single field in the layout to seamlessly clone all the fields in the new group in the layout.
