Merge "Save FragmentManagerNonConfig during onSaveInstanceState()" into oc-dev