Merge "Bug 7491 - Ignore exceptions during invoking notification listeners"