Calling flush when returning to ContactDetailsActivity from the ContactEditActivity
Merge remote-tracking branch 'origin/master'