Also pushes prefer-selection-to-dragging to common.
Giving them the correct parent changed the spacing. (cherry picked from commit 7f602f3) (cherry picked from commit 718db46)
(cherry picked from commit 8ee3e77)