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

* commit '5d79044420e2cb03c0cd27c47f834943983aeb4b':
  Fix dangling pointer bug when transitioning to background.