Use preference change events instead of our own

We weren't catching all of the events, so this should help.

Change-Id: Ia68a0ec5df629b8d4d8221a87bca5a777463d6f5