Merge "Patch up certain kinds of broken notifications." into mnc-dev