Merge "Avoid high edit stash TTLs when a user signature was used"