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

* commit '5ba15cc38f11ffcfa5dbc65e4c213272b458d99c':
  Fix potential NPE when saving fragment state.