Merge "Use main thread executor in the split controller" into sc-v2-dev