Merge "tighten nav bar layout & fix animation bug" into jb-dev