Merge branch 'master' into fixes/macCaretPosition

src/Avalonia.Base/Media/TextFormatting/TextLayout.cs

@@ -174,7 +174,7 @@ namespace Avalonia.Media.TextFormatting
 
             foreach (var textLine in _textLines)
             {
-                textLine.Draw(context, new Point(currentX + textLine.Start, currentY));
+                textLine.Draw(context, new Point(currentX, currentY));
 
                 currentY += textLine.Height;
             }

src/Windows/Avalonia.Win32/Input/Imm32InputMethod.cs

@@ -85,16 +85,18 @@ namespace Avalonia.Win32.Input
 
             _parent = parent;
 
-            var langId= PRIMARYLANGID(LGID(HKL));
+            var langId = PRIMARYLANGID(LGID(HKL));
 
-            if(langId != _langId)
+            if (IsActive)
             {
-                DisableImm();
+                if (langId != _langId)
+                {
+                    DisableImm();
+                    EnableImm();
+                }
             }
 
             _langId = langId;
-
-            EnableImm();
         }
 
         public void ClearLanguageAndWindow()