Enable Navigation Bar Control by default

Change-Id: I37397ae87c0f09c54e3821dfe5a1f0c3fbd30b9a