Merge "Adding an improve face matching settings option for Face Unlock" into ics-mr1