Merge "ConfirmUserCreationActivity hide non-sys overlays" into sc-dev