Merge "Go back to keyguard when in SHADE_LOCKED with single tap." into lmp-preview-dev