Revert "Settings: fix display navbutton option"

This reverts commit 90f0c4da1591bb9df284e02f44fe79a157ace107.
Revert "Settings: move force display nav to button settings"

This reverts commit 15a8ff0e2123cd345330dd0d334dcc57b4332387.