Merge "[1/n] Fix DesktopModeWindowDecorViewModelTests" into main