GB Settings: small improvement regarding lockscreen prefs handling
Conflicts:
	src/com/ceco/gm2/gravitybox/GravityBoxSettings.java