Merge "Don't NPE in PanelView"