Merge "Change keyguard to use single-stage unlock." into jb-mr1-dev