Merge changes I29ce7659,I2d6310a2,Ic4b29409,I6c5c970f into nyc-dev

* changes:
  Fixed a stackoverflow in notifications
  Fixed a bug where a notification was incorrectly marked as removed
  Fixed a potential issue where a notification could be empty
  Fixed a bug where the expanded layout would flash