Merge "display: Remove headers that are in QSSI violation"