Some NavBar improvements

Change-Id: I00f814db6c3800b8eb1cf20004ecdfb8d1e00736
Merge "Some NavBar improvements" into du44