Merge "Fixed a bug where notifications could overlap" into nyc-dev