Merge "Fixed a NP when clearing notifications"