Merge "Refactor edit stashing into a PageEditStash service"