Merge "fix expedited syncs. there were times when an expedited sync wouldn't...

Merge "fix expedited syncs. there were times when an expedited sync wouldn't correctly preempt non-expedited syncs" into jb-dev