Merge "When calling removeTask pass mRemoveWithTaskOrganizer" into tm-dev