Merge branch 'master' into 7.3 and update release notes (#14105)

Change-Id: I0c7f4ac1528dda9d1ebde724854bab84092e0c10

1 files changed, 6 insertions, 1 deletions

diff --git a/server/src/com/vaadin/ui/AbstractEmbedded.java b/server/src/com/vaadin/ui/AbstractEmbedded.java
index 8c574fd59e..66752aa5d7 100644
--- a/server/src/com/vaadin/ui/AbstractEmbedded.java
+++ b/server/src/com/vaadin/ui/AbstractEmbedded.java
@@ -34,6 +34,11 @@ public abstract class AbstractEmbedded extends AbstractComponent {
         return (AbstractEmbeddedState) super.getState();
     }
 
+    @Override
+    protected AbstractEmbeddedState getState(boolean markAsDirty) {
+        return (AbstractEmbeddedState) super.getState(markAsDirty);
+    }
+
     /**
      * Sets the object source resource. The dimensions are assumed if possible.
      * The type is guessed from resource.
@@ -73,7 +78,7 @@ public abstract class AbstractEmbedded extends AbstractComponent {
      * @returns Alternate text
      */
     public String getAlternateText() {
-        return getState().alternateText;
+        return getState(false).alternateText;
     }
 
 }