Only save conversation modifications on 'apply'

Test: atest
Fixes: 153754610
Change-Id: Ifddfb2115f7c1f582861b49860a41bcf2bb8385c
2 files changed