Merge "display: Cleanup unused code"