Merge "Disable factory reset in DSU mode" into sc-v2-dev