Merge "Fix should not let users adjust a11y button settings in SuW issue"