Merge "Fix drag down animation when bypassing" into sc-v2-dev