Merge "Allow face HAL to be updated via apex in U" into main