Merge "Show keyguard when SIM is removed"