Merge "Tweak UI of UsageProgressBarPreference" into sc-dev