Merge "Update NavHandle tests to use more conservative timings." into main