Merge "Fix: Drag handles are not shown for selection/insertion"