Merge "Ensure keyguard shows, and tells WM" into udc-qpr-dev