Merge "Change the activity reparent to animate at TaskFragment level." into sc-v2-dev