Merge "hwc: Fix bugs with mixed mode MDP comp"