Merge change 26034 into eclair

* changes:
  Clean up spin animation in rotary selector, and be even more generous for triggering.