Over scroll effects [2/2]

Change-Id: I68da4183fe3c667059be9cf352723ffad4ef6103

Conflicts:
	res/values/slim_arrays.xml
	res/values/slim_strings.xml
	res/xml/display_settings.xml