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

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