Merge "Fixed a bug with encryption where the keyguard was never shown with PIN" into mnc-dev