Merge "Add Preference#onDetachedFromActivity"