Merge "graphics.composer: add @2.3  compatibility"