Merge "Revert^2 "Synchronize bar expansion with WM Shell"" into main