Merge "Add Strings for Storage Settings" into sc-dev