Merge "Fixed a bug where the notification became clearable"