Merge "Fixed a bug with a legacy notification API" into nyc-dev