Merge "Improve MediaProvider WW atoms" into rvc-dev