Merge "Carry over bugfixes from MediaProvider." into rvc-dev