Merge "[Settings] Fix DataUsageSummaryPreferenceControllerTest" into rvc-dev