am 531a5c32: am b0ee0810: Add guards for restoreInstanceState (issue 11982812)

* commit '531a5c324e20b354a674851fd4808c105a80af3a':
  Add guards for restoreInstanceState (issue 11982812)