Merge "Make fragment animations work when fragments go away"