DPI Groups

Change-Id: I55a7842a6fb86e637c13f5e30af98fc8f9c9ad31

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	res/xml/settings_headers.xml