Merge "hal:qaf: Fix to avoid hang while session close"