Merge "display: config: Remove CABL enablement property" into display.lnx.6.0