Merge "Add DISPLAY_DECORATION to HWC3 HAL"