Merge "[Test Week] Add SystemUiControllerTest" into main