Merge "Hide FragmentContainer#instantiate for API 26" into oc-dev