Merge "Refine delay polling control flow"