Add navigation bar height option part 2

Change-Id: Ida4d1d5bdb05ef7abf28adcdfef463188d9a609a