Merge "composer: Fix output buffer unmapping"