am d805c677: Merge "Possible NullPointerException in restorePanelState"

* commit 'd805c67749e7bc80d77028ffa3b58de3b04f621b':
  Possible NullPointerException in restorePanelState