Merge "Update config to enforce subset of hevc streams"