Merge "Fix Flaky UiModeManagerServiceTest" into main