Merge "hwc: Use HWC_DISPLAY_NO_ATTRIBUTE as terminator."