Merge "Fix tooltip accessibility for screen readers"