Merge "display: remove compiler warnings"