Merge "Recompute focus stack if cleared while starting an activity."