Merge "st-hal: fix st session deadlock issue"