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: Ifbf11755b04dc3e0be9c9a2c170d5aa178b3c4df