Settings: readd advanced settings

Change-Id: I56e846fbdc6b60e200da0e81324c041312880301

Conflicts:
	res/values/broken_strings.xml