Merge "When doing activity->activity transfer, use abort instead of finish" into tm-dev