Merge "Only assert on nodes with content descriptions in drag and drop test" into main