Merge "Remove duplicate pollStateDone functions."