Merge "Erase data stored in SharedPreference during factory reset" into sc-dev