Merge "NAS setting onboarding string change" into sc-dev