Merge "PreferenceActivity should not leave message in looper when destroyed"