[HELIX-541] Fix possible livelock in Helix controller, rb=28413