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

Change-Id: I4c54a8fc23af596fe4beef8c5a9c7248621aa185