Merge change 26711 into eclair

* changes:
  Fix widget stopListening NPE.