Merge "Don\'t dock tasks that are non-dockable" into nyc-dev
am: f2d7b28115

* commit 'f2d7b28115773b324a27173ef31c3e58ce3487a7':
  Don't dock tasks that are non-dockable