Merge "Revert "Tune nav bar height""