Merge "Fix bug: NAS set to none will be reset to default after the second reboot" into sc-dev