Over scroll effects [2/2]

Change-Id: I68da4183fe3c667059be9cf352723ffad4ef6103

Conflicts:
	res/values/probam_arrays.xml
	res/values/probam_strings.xml
	res/xml/system_ui_settings.xml
Merge branch 'cm-11.0' of https://github.com/bje0716/android_packages_apps_Settings into cm-11.0