Merge "Fix race condition with calling stop() before run()"