Merge "Less lazy child FragmentManager creation" into nyc-dev