Merge "Attempt to fix NPE in keyguard" into jb-mr2-dev