am 8b5161c2: am d68cda47: An attempt to unregister a handler that\'s no longer registered should not cause an assertion.

Merge commit '8b5161c2aed8637de9bffb1d81298d60ea237caf'

* commit '8b5161c2aed8637de9bffb1d81298d60ea237caf':
  An attempt to unregister a handler that's no longer registered should not cause an assertion.