Merge "Wait for HAL service death signal before trying to connect it again" into main