Merge "Fix keyguard bugs" into jb-mr1-lockscreen-dev