Merge "Don't update DIRTY flag when updating non-voicemail columns"