am e924f5b2: am 59d6d943: Merge "Revert "Revert "Recompute focus stack if cleared while starting an activity.""" into mnc-dev

* commit 'e924f5b246ebc3605f0f484f57f95ce875829cfc':
  Revert "Revert "Recompute focus stack if cleared while starting an activity.""