Merge "Add missing null check to AppErrors#handleAppCrashLocked" into nyc-mr1-dev