DSSSM-162 #time 25m Removing the "close" button for the apply/discard modal and ensuring that the facet modal is closed only after the apply/discard modal has been closed