Merge "Update lock screen user switcher on settings update and re-create view stub after disabling multi-user" into sc-dev