Merge "Changing SystemUiProxy to kotlin" into main