Merge "Allow MediaCasTest to run on Q successfully" into rvc-dev