Merge "Prune old edit stash entries from users as they create more"