Merge "Edit stash: Simplify with postWithToken"