Merge "Add UsageProgressBarPreference"