Merge "Fix stacked notifications."