Merge "Revert "Fix NPE calling FragmentHost.notifyViewCreated"" into nyc-dev