Merge "display: Switch to QTI allocator and mapper" into display.lnx.5.0