Lockscreen Notifications [2/2]

Conflicts:
	res/values/n5x_strings.xml
	res/xml/lockscreen_interface_settings.xml