Merge "MediaCas: fixes for playback tests" into oc-dev