Merge "display: 64-bit cleanup for logs"