Merge change I775e1ec0 into eclair

* changes:
  Debugging for issue #2250075: Desk dock clock app sometimes doesn't