Merge "Add new strings for face auth/enrollment" into sc-dev