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

* commit '989c753281fcb689ea163530096ac589c9e5a44f':
  fix expedited syncs. there were times when an expedited sync wouldn't correctly preempt non-expedited syncs