Merge "Add a boolean variable to signal whether we use deadzone with nav bar,...

Merge "Add a boolean variable to signal whether we use deadzone with nav bar, and use that signal in our existing logic." into main