Merge "Protect FragmentManager against View.NO_ID container ids" into nyc-dev