Merge "Split DesktopModeWindowDecoration relayout into two stages." into main