ROLLUP JAVA:: Add back lockscreen camera widget toggle.

Conflicts:
	res/values/strings.xml