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