Merge "Do not block transaction application on flush"