Merge "CE: Add test coverage for Output::composeSurfaces"