Merge "Revert "Revert "Recompute focus stack if cleared while starting an activity.""" into mnc-dev