Merge "SIM PIN unlock - Keyguard in invalid state" into sc-dev