Merge change 5339 into donut

* changes:
  Fix intermittent crash related to call waiting