rest of #1247

TextboxHelper.Watermark should respect Padding