Merge "Don't prematurely finish sync if an explicit sync is in flight" into main