Merge "Pass extra information to face HAL" into main