Merge "[DataUsage] UX enhancement" into rvc-dev