Remove NavBar customization for now

Change-Id: Ia0c78ef4a986816f8f5348d0f92da1f2e20c4ca4