Merge "Fix crash on clicking dismissed notifications"