Similar to the fix in master, restore struts handling for the dock
when not autohiding (except that we don't have GSettings here, so
no dynamic changes)