Merge "Fix some crashes in notification history"