Merge "display: remove compile time warnings"