Merge "Resolving race condition while writing recent taskids" into nyc-mr1-dev