Merge branch '109-harmonize-head-and-orientation-tracking-xcheck' into 109-harmonize-head-and-orientation-tracking-xcheck-call-order