Merge "fix notification manager crash"