Merge "Fix broken animation on two consecutive swipes." into tm-dev