Merge "Allow ModernMediaScanner to set MEDIA_TYPE" into rvc-dev