Merge "Fix job scheduler crash due to uninstall race" into nyc-mr1-dev