Merge "Set resizing to false if no fling animation" into sc-v2-dev