Merge "Clear UsageProgressBarPreference image view before setting images" into sc-dev