Merge "[Thread] rename isEnabled() to shouldEnableThread()" into main