Merge "Enable default NAS for users who haven't done NAS migration" into sc-v2-dev