Merge "Remove unused ApiStashEdit variable"