Merge "hwc2: Needs validation on display animation"