Merge "Fix NPE in UiModeManagerServiceTest" into main