Merge "Change spinner button role to "DropDownList"" into main