Merge "Fix Storage Settings summary jank"