LPS-45492 Fix stop watch race conditions