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

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