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