Merge "On db upgrade, reset ringer mode to normal." into lmp-dev