Merge "updateNonSystemOverlayWindowsVisibilityIfNeeded on relayoutWindow"