Revert "FW: Enable nav bar"

This reverts commit be5a0ea2bf6138c7a89dfbfdba4cf8424aadd6f4.

rebase

Change-Id: I67065db7fc5323dcac9e41662a3aaa192a768db7