Merge "Clean-up ActivityRecord reparenting/adding to Task (57/n)"