[Fluent] Fixes mulitple issues is TextBox and TextBoxBase styles (#10756)

* Fixes issues is TextBox and TextBoxBase styles

* Minimizing extra non functional changes

* Matching parity with Aero2 for TextBox style

Author: dipeshmsft

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HC.xaml

@@ -587,13 +587,13 @@
     <SolidColorBrush x:Key="TextControlForegroundDisabled" Color="{StaticResource SystemColorGrayTextColor}" />
     <SolidColorBrush x:Key="TextControlBorderBrush" Color="{StaticResource SystemColorButtonTextColor}" />
     <SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="{StaticResource SystemColorHighlightColor}" />
-    <SolidColorBrush x:Key="TextControlFocusedBorderBrush" Color="{StaticResource SystemColorHighlightColor}" />
+    <SolidColorBrush x:Key="TextControlBorderBrushFocused" Color="{StaticResource SystemColorHighlightColor}" />
     <SolidColorBrush x:Key="TextControlBorderBrushDisabled" Color="{StaticResource SystemColorGrayTextColor}" />
 
     <!-- Deprecated TextControl Brushes -->
-        <SolidColorBrush x:Key="TextControlBorderBrushFocused" Color="{StaticResource SystemColorHighlightColor}" />
+        <SolidColorBrush x:Key="TextControlFocusedBorderBrush" Color="{StaticResource SystemColorHighlightColor}" />
         <SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="{StaticResource SystemColorGrayTextColor}" />
-
+    
     <!--  Thumb  -->
     <SolidColorBrush x:Key="ThumbBackground" Color="{StaticResource SystemColorButtonTextColor}" />
 

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Variables.xaml

@@ -28,9 +28,10 @@
     -->
 
     <Thickness x:Key="TextControlBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="TextControlThemePadding">10,5,6,6</Thickness>
+
     <!-- Moved to Light, Dark and HC resource files -->
     <!-- <Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness> -->
-    <Thickness x:Key="TextControlThemePadding">10,5,10,6</Thickness>
 
     <system:Double x:Key="ContentControlFontSize">14</system:Double>
     <system:Double x:Key="TextControlThemeMinHeight">24</system:Double>