Merge "Redesign user switcher" into rvc-dev