Merge "Prevent setting the launch task id when docking." into nyc-dev am: 386a947616 am: fb8ff0fd31
am: 4499f5d5b7
* commit '4499f5d5b775ad06db66343046160fb43bdfdb17':
Change-Id: I3ce772a06a73ee8f36ba581cb8e17a17ab3d07af
This commit is contained in: