am 217a3098: am 1eeea0c9: Use new SharedPreferences.apply() instead of commit().

Merge commit '217a3098a4efc8efafb85deb7014da8ed5a7ac96'

* commit '217a3098a4efc8efafb85deb7014da8ed5a7ac96':
  Use new SharedPreferences$Editor.apply() instead of commit().