Merge "Fixes multiple activity snapshots can stay in cache." into main