Merge "composer: increase timeout for VTS"