Merge "Reland sfps enroll improvement feature with feature provider" into main