Merge "Remove Widget Resize Border on Accessibility delete" into main