Merge "Fix how we hide and show the nav bar."