Merge "Merge "Fixed a bug where notification header could become empty" into nyc-dev am: 57e4a67be1 am: 58a22c56bc" into nyc-mr1-dev-plus-aosp