issue #22341: Make picker emit correct valueChanged event data when picker is bound to a collection. Other touch up to make code more straight forward.