Merge "Update ViewModels to use new Media APIs" into rvc-dev