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

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