Merge "Fix issues with Contacts sync."