Merge "Fix UsageProgressBarPreference number pattern problem" into sc-dev