Merge "composer: fix punchhole logic"