Refactor Blocklist and ChooseContact activities