Merge "Align AppPreference's progress bar height to spec" into main