diff --git a/api/Avalonia.Skia.nupkg.xml b/api/Avalonia.Skia.nupkg.xml
new file mode 100644
index 0000000000..7abbc47cea
--- /dev/null
+++ b/api/Avalonia.Skia.nupkg.xml
@@ -0,0 +1,10 @@
+
+
+
+
+ CP0006
+ M:Avalonia.Skia.ISkiaGpuWithPlatformGraphicsContext.TryGetGrContext
+ baseline/netstandard2.0/Avalonia.Skia.dll
+ target/netstandard2.0/Avalonia.Skia.dll
+
+
diff --git a/samples/ControlCatalog/Pages/OpenGlPage.xaml b/samples/ControlCatalog/Pages/OpenGlPage.xaml
index 2d1285566c..0e557cc1ad 100644
--- a/samples/ControlCatalog/Pages/OpenGlPage.xaml
+++ b/samples/ControlCatalog/Pages/OpenGlPage.xaml
@@ -3,8 +3,11 @@
x:Class="ControlCatalog.Pages.OpenGlPage"
xmlns:pages="using:ControlCatalog.Pages"
xmlns:openGl="clr-namespace:ControlCatalog.Pages.OpenGl">
-
+
+
diff --git a/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs b/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
index 28f4d7e073..f7a7e60f89 100644
--- a/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
@@ -1,8 +1,12 @@
+using System.Runtime.InteropServices;
using Avalonia;
using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
using Avalonia.Markup.Xaml;
using Avalonia.OpenGL;
using Avalonia.OpenGL.Controls;
+using Avalonia.Rendering.Composition;
using ControlCatalog.Pages.OpenGl;
// ReSharper disable StringLiteralTypo
@@ -16,6 +20,30 @@ namespace ControlCatalog.Pages
AvaloniaXamlLoader.Load(this);
this.FindControl("GL")
!.Init(this.FindControl("Knobs")!);
+
+ AttachedToVisualTree += delegate
+ {
+ if (TopLevel.GetTopLevel(this) is Window)
+ this.FindControl