Merge "display: config: Change QtiMapper flag to V3.0" into qt-qpr1-dev