Merge "Unable to drag and edit the Accessibility shortcut" into main