Fix last survey sorting for all contacts
Merge branch 'MH-534' into dev