Merge "Use falsing manager on click to open user switcher" into sc-dev