Merge "going directly to backup after face unlock fails 15 times" into ics-mr0