am 3847e645: am 5d790444: Merge "Fix dangling pointer bug when transitioning to background." into lmp-dev

* commit '3847e645ffde285b665de2ae96560afe67b2754f':
  Fix dangling pointer bug when transitioning to background.