Merge "Clean up mediabrowser callbacks" into rvc-dev