Merge "Cancel Syncs that aren't making progress." into mnc-dev