Make sure that our last event before going sorta-idle is not one in which we claim to be in flow control.
Explain
Merge bug25912
stable to default