Merge "[Settings] Align data usage calculation" into rvc-dev