Merge main to 109-harmonize-head-and-orientation-tracking