Merge "Fix NPE while running UserSwitcherController" into sc-v2-dev