Merge "Revert "Use callback executor when querying wallet cards from QAW client."" into tm-dev