Merge "Prevent Keyguard dialog from showing on private displays."