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