Merge "Synchronize bar expansion with WM Shell" into main