Merge change I486fdb55 into eclair

* changes:
  Fix bug 2183179 - Hitting the back key repeatedly makes the notification shade jump up and down