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

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