Merge "Fix nav inset for gesture nav"