Merge "Fix crashes after notifying bad notification" into nyc-mr1-dev