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

* commit '1b6b42e356f1365f23e2553a8718d4dfa9f52358':
  Add guards for restoreInstanceState (issue 11982812)