Merge "Set correct task remove mode when reparenting" into oc-dev
am: 7b64dbd529

Change-Id: Iec0d1817e29d1ea1b06f0da10f42de2bb55c40dc