Merge "display: Reconcile display HALs"