Merge "Introduce ElementStateScope" into main