Merge "hwc/overlay: Remove DPY_TERTIARY display enums"