Merge "Add logging constants for pref change tracking in Settings."