Merge "composer: Fix output buffer unmapping" into display.lnx.9.0.r1-rel