Merge change I875200fe into eclair

* changes:
  Another fix for #2186897: Cannot unlock the device by swiping