Merge "Prox's DelayableExecutor needs to be on the main thread" into sc-v2-dev