Merge "Renamed thread_enabled flag to thread_enabled_platform" into main