updates for android dragging bug
removing setTimeout in transition