Merge "hwc: tonemapper: Update handle ID for inverse tonemapper"