Merge "Revert "Test for composer and other tags in mp4"" into rvc-dev