Merge "drop corrupt notifications in the Listener" into mnc-dev