Cleaning up advanced settings
Add N1 Parts header

Change-Id: I3a5d81abaa13936cb2bd4ef3b81f77a0d393de03

Conflicts:
	res/xml/settings_headers.xml