[2/2] Navigation bar height control

Change-Id: I8f9ca8654d78b9ca7bdc998e028f23b809bf8e46