I dont think we needed a new catagory for NavBar force enable/disable. Moved to buttons settings.

Change-Id: I5f8912257ccc6e00cfbc058ad5370a9a65577e81