Merge "Fix keyguard checking when installing user certs."