Merge remote-tracking branch 'omni/android-4.4' into ose

Conflicts:
	res/values/strings.xml
	src/org/omnirom/omniswitch/Utils.java
	src/org/omnirom/omniswitch/ui/SwitchGestureView.java
	src/org/omnirom/omniswitch/ui/SwitchLayout.java