Merge "This enables the back button in keyguard" into jb-mr1-dev