Merge "Fix UserSwitchTransitionViewMediatorTest" into rvc-qpr-dev