Merge "Fix unresponsive back button in keyguard." into jb-mr1-dev