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