Merge "Don't dock tasks that are non-dockable" into nyc-dev