Merge "display: Remove unused headers"