Merge "qseecom: fix a race condition when TA is blocked"