Merge "Made background updater more robust to state changes" into nyc-mr1-dev