am 034cd0be: Merge change I486fdb55 into eclair

Merge commit '034cd0be57d76b3bf5c7a3c118f6f10e67755772' into eclair-mr2

* commit '034cd0be57d76b3bf5c7a3c118f6f10e67755772':
  Fix bug 2183179 - Hitting the back key repeatedly makes the notification shade jump up and down