Merge "Fix positioning bug in user switcher" into sc-dev