Merge "Making keyguard dismissal a permanent solution" into main