Merge "Wait for JobService to start before scheduling syncs" into nyc-dev