Merge "Perform layout after removing the focused window"