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