Merge "Add full screen user switcher to lock screen"