Revert "Runtime toggle of navbar"

This reverts commit b6a1eb3bd5438906f06a076a7c29d97376638496.

Change-Id: I667cbc14f3406e0b87f3b594988d0acab91a9327