Merge "Fix Storage Settings progress bar summary jank problem" into sc-dev