Merge "Remove another Keyguard special-case for SLEEP" into main