Merge "Make "presumed-fresh" edit stash case cover when users make intervening edits"