[6/8] Settings: Theme engine - update

Change-Id: I9a0c9da454b5239a43d287af9f2df8c4d042d466

Conflicts:
	res/values/custom_strings.xml