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

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