Merge "SF: Connect the VDS scratch surface producer"