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

Change-Id: Ie9642e41ae7661d340e482e30cba5d30ea6d41c2
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
Set defaults in RC to match framework defaults

Change-Id: I4204e76863bc6b685a4b54cd9fb906a6facdc30a
attempt to move

Change-Id: Ia747b1ab16441b4a9bc6c197de4135ac32fc7c65
Derp

This reverts commit d9e8e328c3531ac779ed8eebd5e18753636b429c.