Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev