Merge "Make face.virtual HAL smaller" into main