Merge "Extend SfpsEnrollmentFeature for text updating when progress changes" into main