Merge "Prevent callbacks after onStop is called." into pi-dev am: b16affc402
am: 6b79b2ce36

Change-Id: Ie3eb69bf498a6a1958a7d2a4bd801695c123ba54