Merge "display: Fix dependency compile error"