Settings: move force navigation bar up to avoid confusion

Change-Id: I5135ed95a783ea92cf91ea4a60a94bdb780c310d