Merge "Change SharedPreferences.Editor.commit() to apply()"