Merge "display: Support compile time QMAA"