Merge "Add view/drawable states for drag-accepting / drag-hovered"