Merge "Initial pass at re-enabling face unlock in new keyguard." into jb-mr1-dev