Merge "Cancel animating the divider bar after it being released" into tm-dev