Merge "Update the dropdown arrow of Spinners based on new UX" into main