Merge "lshal: do not pthread_kill" into main