RC: don't show navbar locations for battery bar if navbar is disabled

Change-Id: Ie9642e41ae7661d340e482e30cba5d30ea6d41c2
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>