Merge "Fix wrong parameter order for main/bg thread executors" into main