Merge "Don't check the keyguard PIN a second time" into mnc-dr-dev