Merge "display: Enhance debug logging"