Merge "Adding applyToken for any setTransactionState call" into qt-dev