Ungroup wokspaces and fix plotting

Refs #10687
Merge remote-tracking branch 'origin/feature/10687_indirect_diffraction_ungroup_result_workspaces'