Merge "Add flag for DW a11y metrics" into main