Merge "display: Add cleanspec for display"