Merge "Use recommended architecture for keyguard dismissal" into main