Merge "Fix race condition using notification pipeline" into main