Revert input method advanced options
Settings: : add customizable lockscreen targets (2/2)

Conflicts:
	AndroidManifest.xml
	res/values/mahdi_strings.xml
	res/xml/lockscreen_interface_settings.xml