am 9516b6ee: Use new SharedPreferences.apply() instead of commit().

Merge commit '9516b6eef76b3504913f5efcadf603969946a3d0'

* commit '9516b6eef76b3504913f5efcadf603969946a3d0':
  Use new SharedPreferences$Editor.apply() instead of commit().