[bug fix] Fix to #3137 and #3239 (#3240)

* #3137 add the leftover code from #3138 for fixing issue #3137

* #3239 Use slice id as the key instead of sliceName

superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx

@@ -74,6 +74,7 @@ class ControlPanelsContainer extends React.Component {
                   key={`controlsetrow-${i}`}
                   controls={controlSets.map(controlName => (
                     controlName &&
+                    this.props.controls[controlName] &&
                       <Control
                         name={controlName}
                         key={`control-${controlName}`}