Merge "Fixed a bug where the notification content could become empty" into nyc-dev