Fix NPE in ConnectivityService

Could occur when requestRouteToHostAddress is called on a network
with no associated tracker.  Code later in the method handles
this case gracefully but code introduced in JB throws an exception.

Change-Id: I6c8a0e313ecbcca120aeb5dd0802a72114749aa1
Fix navbar layout

Before: http://owain.nl/before.png
After:  http://owain.nl/after.png

Change-Id: Ie3e3c54a9644d232b1d9b74cbc9fa0eeed072b98