Merge "Simplifying the drop animation code" into sc-v2-dev