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

Change-Id: I3e806eba2601cd7fe7b0f1c60bc5978b3f4e3ef8

Conflicts:
	res/values/strings.xml