Fix additional sort when clicking filter icon

Fix additional sort happening when clicking the
filter icon on firefox.

#### Ready for Review 

#### Ready for Merge

#### Testing Instructions - Local test
  * On firefox, when clicking on the filter icon in a filter column on the datagrid, the column sort event is automatically fired and the column is sorted. The filter pops up, but only after the sort has been done. This causes unnecessary network traffic. Test that this no longer happens. 
  * Test that the datagrid still works as expected. 

#2674
Clean up imports