Merge "primary-hal: Fix stability issues"