am d85a37d3: (-s ours) am 3b8a7db6: DO NOT MERGE Fix NPE in Tab.saveState()

* commit 'd85a37d3cce49352453b0f41b43da863c7639120':
  DO NOT MERGE Fix NPE in Tab.saveState()