Merge "Fix widget drop animation" into sc-dev