Merge "st-hal: fix incorrect client session state"