Merge "Match PREF_CHANGE event name and id to metrics_constants"