Merge "Add MPEG-H enum." into sc-dev