am 06b7e0fa: Merge "tighten nav bar layout & fix animation bug" into jb-dev

* commit '06b7e0fafdee08f7045f419b19eb1aacb00d7d60':
  tighten nav bar layout & fix animation bug