Merge "Fix potential null pointer exeption in keyguard" into jb-mr1-lockscreen-dev