Merge "Fix edge-to-edge rendering in ShareTest" into main