Merge "Don't save contact after deleting it" into lmp-mr1-dev