Merge "Prevent nav mode from being -1 to avoid crash"