Merge "[ToA] Move IO to background thread" into main