Merge "Remove A11y feature dependent shortcuts from blocklisted triggers" into main