08763af07e
* commit '8f1b2e0b7fdb1de3537fe3f45ba634fb74a94b4e': Attempt to fix NPE in keyguard
* commit '8f1b2e0b7fdb1de3537fe3f45ba634fb74a94b4e': Attempt to fix NPE in keyguard