Merge "Fixing issue with excluded task showing when docking." into nyc-dev