Merge "Prevent setting the launch task id when docking." into nyc-dev