Merge "Revert "NumberPicker a11y (and a11y-inspired) fixes"" into oc-dev