Merge "Add null check to cleanupRecentTasksLocked." into lmp-dev