Merge "Remove code usage of flag cleanup_a11y_overlays" into main