Merge "Spinner touchstates now in line with list states"