Merge "Enable new keyguard" into jb-mr1-dev