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

* commit '07fd6bd2709468cce968e852bc0c354cb4e11065':