Add a flag to control whether or not we wait for both tiles to be stationary before swapping