Merge "Do not add edge extension if the container is translucent" into main