Merge "Support contents (overlays) in ElementStateScope" into main