Fix last survey sorting for all contacts
Fix conflicts after merging MH-534 to dev