Merge "Allow nav bar height to vary between portrait and landscape." into jb-dev