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

Change-Id: I5ebc2cff38a38f2916414576332d757553c5de60