Merge "Possible NullPointerException in restorePanelState"