Merge "Fix NPE of null FragmentHostImpl" into nyc-dev