Merge "Use new FragmentManager APIs"