Merge pull request #12918 from JosJuice/revert-revert-audit-get-state Partially revert "Revert "Audit uses of IsRunning and GetState""