Merge "Transition a second time if background doesn't arrive on time" into tm-dev