Merge "Storage Settings hides categories when loading" into sc-dev