am cbf77e9b: Merge change I875200fe into eclair

Merge commit 'cbf77e9bef0db68c55b60994d93674bf6fd1ca13' into eclair-mr2

* commit 'cbf77e9bef0db68c55b60994d93674bf6fd1ca13':
  Another fix for #2186897: Cannot unlock the device by swiping