Merge "Fix bug when adding SET_INSTALL_LOCATION to SettingsProvider database, upgrade path."