Merge "Make timeout optional for pausePolling & also resumePolling only if not started" into main