Merge "[DO NOT MERGE] Use new QueuedWork interface." into nyc-mr2-dev