Merge "[Expressive design] Update padding for UsageProgressBarPreference" into main