Merge "hwc: Fixes for MDP3 targets"