Merge "Piping through ability for an Activity to remove its own task. (Bug 13735914)"