Minor clean up

Conflicts:
	res/xml/preference_headers.xml