Merge "SystemUI: Fix crash from bad notifications" into nyc-mr1-dev