The answer on whether the Avengers are time traveling in Avengers 4 has been answered.
SPOILERS
Latest set photos from Avengers 4 show Tony Stark’s B.A.R.F. that we saw in Civil War. Binary Augmented Retro Framing so looks like they need to figure something out in the first Avengers movie.