Merge "Possibly fix bad notification updates." into honeycomb