Merge "Persist UsageStats before backup." into rvc-dev