Merge "hwc: Fix MDP comp array index access"