Merge "Fix 2495749 - System process crash when a notification switches sections."