Merge branch 'update_persona_frame_locator' into persona_smoketest