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

* commit '31e2ce0ea617bfe07a5c20d3c2b0433f14531678':
  Bail if activity was destroyed.