Merge change 25647 into eclair

* changes:
  Some tweaks to the rotary lock widget.