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

* commit '3c40675f6f473896b93ca6416d29192d88e92622':
  Fix potential NPE when saving fragment state.