Merge "provide a cleaner notification dump" into mnc-dev