Moved ApplyWatermark to WatermarkConfig
WatermarkForm changes