Merge "Cleanup Storage Settings" into sc-dev