Merge change 25959 into eclair

* changes:
  Add better transition to rotary lock widget when triggering: spin around instead of snap back.