Merge "Add alt auth affordance for keyguard notif-taps" into sc-dev