Merge "Fix a SIGSEGV at background-to-foreground collector transition." into lmp-dev