Merge "Skips AccessibilityShortcutChooserActivity on watch." into main