Merge "Fix Settings Condition expand button a11y label" into nyc-dev