Merge "Add a temporary user switcher to quick settings" into master-lockscreen-dev