am b98e0d8a: am d190d989: Merge "Fix dangling pointer bug when transitioning to background."

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