Merge "Move child FragmentManager shutdown for retained fragments" into nyc-dev