Avengers: Infinity War trailer

YES.

The characters sharing the speech about the idea is a lovely touch.

The Vision and Scarlet Witch moment is apparently from the Edinburgh shoot. The bit with the spear might be in Waverley Station...