Merge "Reset AAID connection on TRANSACTION_FAILED" into main