Merge "composer: fix 2.4 vts for multi-display"