Merge "Fixing UI leaks when using inline-subclass" into main