Merge "Update config to enforce subset of vp9 streams"