Merge "Make tracking notification ttls more performant" into main