Merge "Don't invalidate swipe handler until parallel anim finishes" into main