Refactor loading of 'All Contacts' page
Fix conflicts after remerging MH-565 to dev