Merge changes I020bd406,I85f82b8e into sc-dev

* changes:
  Support custom content in UsageProgressBarPreference
  Adjust layout of UsageProgressBarPreference