Merge "Fix some bugs in SettingsProvider that I introduced the other day." into gingerbread