am 415b8125: am d805c677: Merge "Possible NullPointerException in restorePanelState"

* commit '415b812569cb78e560f9d3a2a4d8944680669318':
  Possible NullPointerException in restorePanelState