Merge "Use background dispatcher instead of executor" into main