Merge "Fix a deadlock in emulator HAL implementation" into main