Merge "Avoid race in single thread suspension." into lmp-dev