Merge "Revert^2 "Move cold notification flows to the bg thread."" into main