Merge "Extract DDMS PreferenceStore."