Merge "display: Makefile fixes"