Merge branch '36448-smiles-are-broken-in-9-5-0-rc2' into 'master'

Fixes the blown up emoji problem in notes

Closes #36448 and #36282

See merge request !13632

app/assets/stylesheets/framework/typography.scss

@@ -18,7 +18,8 @@
     background-color: $gray-lightest;
   }
 
-  img.js-lazy-loaded {
+  img.js-lazy-loaded,
+  img.emoji {
     min-width: inherit;
     min-height: inherit;
     background-color: inherit;