Merge "Only save conversation modifications on 'apply'" into rvc-dev