Reorder settings

(cherry picked from commit 10ac7589772ddaab14caf27a797488fd2bad1c50)

(cherry picked from commit e120b0db44c201755f9f8ecdf8a87af4497711d8)

Conflicts:
	res/xml/settings_headers.xml