Merge "Improve MediaProvider event metrics" into rvc-dev