Merge "Fixed a bug where the notification size was incorrect"