Merge "Put more code under #if CONFIG_MULTITHREAD."