Merge "Update UsageProgressBarPref layout" into sc-dev