Fix Lockscreen/Notification IconDerps

Conflicts:
	res/values/strings.xml