Merge "Fixing memory leak in PreferenceScreen."