Fix some docking clearance bugs
Merge remote branch 'upstream/master' into joystick_configurator