Merge "Clean up param handling in ApiStashEdit"