Don't save editor before showing join suggestions

This requires us to pass the raw contact ID of the
contact to join to both the (new) confirmation
dialog and the contact save service so that we
have it to do the join after the save completes.

Bug 25314004
Bug 21956248

Change-Id: Icdcb2165a0e599dfa3745fe8a919b208d4a48b43