Merge "Allow disk writes on main thread in SharedPrefs"