Merge "Keyguard bug fixes" into jb-mr1-dev