Merge "Remove non-shell transitions split code from SystemUiProxy" into main