Merge change I9b12eeb5

* changes:
  Applying PrefsTester to PreferenceChangeEventTest to manage side effects.