RC: Option to hide Camera widget from lockscreen (2/2)

Conflicts:
	res/values/strings.xml

Change-Id: I28d6d9b2edab7b66325b48695b372243fbaf3cbd