Merge "Fix widget drop animation in 4x5 grid" into tm-dev