Merge change 22940 into eclair

* changes:
  Fix bug 2040024 phone rings only once sometimes.