Fix old profile content not being cleared correctly when saving content file selection (Fixes #2173)
Re-insert existing DialInfo records when they are modified by another content file (Fixes #2170)
Merge remote-tracking branch 'scrawl/launcher'
Merge remote-tracking branch 'scrawl/master'