am 8cf54264: Merge "Ensure that listener is removed only if it was added" into mnc-dev

* commit '8cf54264995aea65d77c25b5050cb3aac0196c59':
  Ensure that listener is removed only if it was added