Merge "display: Fix up kernel header dependencies declaration"