Merge branch 'master' into fixes/tooltip-stuck-on-screen

src/Avalonia.Themes.Fluent/TextBox.xaml

@@ -66,7 +66,9 @@
                                Text="{TemplateBinding Watermark}"
                                TextAlignment="{TemplateBinding TextAlignment}"
                                TextWrapping="{TemplateBinding TextWrapping}"
-                               IsVisible="{TemplateBinding Text, Converter={x:Static StringConverters.IsNullOrEmpty}}"/>
+                               IsVisible="{TemplateBinding Text, Converter={x:Static StringConverters.IsNullOrEmpty}}"
+                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
+                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
                       <!-- TODO eliminate this margin... text layout issue? -->
                       <TextPresenter Name="PART_TextPresenter"
                                    Margin="0 1 0 0"
@@ -79,7 +81,9 @@
                                    PasswordChar="{TemplateBinding PasswordChar}"
                                    SelectionBrush="{TemplateBinding SelectionBrush}"
                                    SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
-                                   CaretBrush="{TemplateBinding CaretBrush}"/>
+                                   CaretBrush="{TemplateBinding CaretBrush}"
+                                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
+                                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/> 
                     </Panel>
                   </ScrollViewer>
                 </DataValidationErrors>