Merge change If933b13d into eclair

* changes:
  Fix for 2161835: Tweaks to rotary lock screen: