am 3b9fbd2f: Merge "Fixed a bug with encryption where the keyguard was never...
am 3b9fbd2f: Merge "Fixed a bug with encryption where the keyguard was never shown with PIN" into mnc-dev
* commit '3b9fbd2f':
Fixed a bug with encryption where the keyguard was never shown with PIN