Merge "Revert^2 "Changing SystemUiProxy to kotlin"" into main