With current version, when popout window restore to main window, it will affect grid layout.
popout window is similar to floating group, so I think it is better that popout window restore to a new floatting group, which can keep grid layout unchanged.