Merge "vp9 register checks only apply to vp9"