Merge "Disable security view transitions in keyguard" into jb-mr1-dev