Merge "Fix compile error if FAST_THREAD_STATISTICS not defined"