Merge "Ensure that we're animating the current live tasks when going back" into tm-dev