Merge "Update Pre-L account switcher" into ub-gmail-ur14-dev