Merge "display: Fix warnings"