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