Merge "Remove face auth from setup wizard when configured as a convenience." into sc-v2-dev