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