Merge "Enable face_auth_refactor flag" into main