Merge "Minor UI adjustments to a11y button chooser" into oc-dev