Fix assigning apps to navigation ring.

Change-Id: I78863dd1ea9b07b5cd4fa4fbedc8a4700abffabd
Network color preference

Change-Id: Ic71127ed5e8659049d3154f8f4c733f1512de37b
Match logic for lockscreen camera widget

The fw_base side is enabled by default, thus this one should too

Change-Id: I7690c939af41c2d09092e7206814c70d31498d8e
Add back Thinking Bridge traffic meter

PS2: Remove dependency for network color now that its used for both
PS3: A few string changes

Change-Id: Ifd867b22965cb28975068ba880036b986ec26062

Conflicts:
	res/values/strings.xml