Settings: cursor animation not ready
Settings: Fix SwitcherHelpers NullPointerException
Settings: Optimize systemsettings and cleanup

Conflicts:
	res/values/strings.xml