Merge "Skip ApiStashEdit if custom DataUpdates are present."