Merge "hal: fix thread starvation"