Revert"Settings: Force show navigation bar (2/2)"