Merge "Fix "keyguard unresponsive" bug" into jb-mr1.1-dev