Merge "Change SharedPreferences.Editor.commit() to apply()"
am: a7069d50c4

Change-Id: I8764aa40284547db0cee0972d40a000fa9571367