Remove NavBar customization for now

Change-Id: I09b9ef2581767c654f8687f1f61fb7b919c33073