Merge "Fix crash with decorated custom notifications" into nyc-dev