Fix a bug where a short fling resulted in a bad state

Change-Id: I43900d1cb72a03e2fb2e6cb2dea44bfad9792fcc
1 file changed