REGRESSION (r294160): Occasional infinite loops under updateLayersForInteractionRegions