Merge "Add flag for a11y custom headers" into main