Fixes for swipe heightmatch animation bugs