Replace SharedPreference commits with non-blocking applys