Merge "fix settings data base upgrade for ringer mode" into jb-mr1-dev