am 847d677f: am 3c40675f: Merge "Fix potential NPE when saving fragment state."

* commit '847d677f348cfe8dfca8b976dc1fbc40a865d4c9':
  Fix potential NPE when saving fragment state.