Merge "Ensure keyguard shows, and tells WM" into main