am de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev

* commit 'de005547bae3799265fdad8f61720a82241f4b07':
  Bail if activity was destroyed.