Revert "Remove Enable Nav Bar options"

This reverts commit 36c6d3844e048b630131176119e95638344d6e85.

Change-Id: Ia1085fbb4c99b68e95374c172c7be834709e87c4