Merge "Add head tracking to multi-HAL conversion code"