Merge "NAS Settings onboarding notification" into sc-dev