am 525eb402: Fix some SharedPreferences issues

* commit '525eb4024539661766ac06432d91ef999206cc0d':
  Fix some SharedPreferences issues