NavBar Size Control [2/2]

Change-Id: I599595b4bc60d79377a6e2d61c6e9b1482b6d56e