Merge "Apply theme to PreferenceActivity headers"