Merge "Crash when no item selected in ControlPanelPicker"