Merge "Do not reset keyguard when SIM is ready"