Merge "Move SharedPreferences code to its own class." into tm-qpr-dev