Merge "Apply MainlineTestModuleController to mediaprovider tests" into rvc-dev