Merge "Sets Storage Settings progress bar unselectable" into sc-dev