Merge "Fix LayoutParams cast exception in drag-n-drop" into sc-dev