TMSS-717: reverted to setting the queueing state just before the queued state. It's near impossible to keep MAC internal bookkeeping in sync with TMSS