Merge "st-hal: Fix deadlock when load/unload merged sm while buffering"