Merge "Fix face unlock for multiple users" into jb-mr1-dev