Merge "Enabling Face Unlock for user switching (bug 8495282)" into jb-mr2-dev