Merge "Prevent setting the launch task id when docking." into nyc-dev
am: 386a947616

* commit '386a9476160ecd8d7d647d1a305126ec0917e0ab':
  Prevent setting the launch task id when docking.

Change-Id: I6f54a53099dd8b4c53674a866dc3fdfba1b59b70