Settings: Squash all Listview commits from ThinkingBridge

Change-Id: I2ee118fdcebc7f73ef4dccffe809b8bc7e054699

Conflicts:
	res/values/strings.xml
Fix derp