Revert "[2/2] Settings: allow to force enable navigation bar"

This reverts commit 6f0ef9978fcf781590bea2cadc93ca4e2a31483a.

Change-Id: I12676c37a2e360153e42647f558f2291d6314b65