Merge "hwc2: Array and enum boundary checks"