Merge "Focus gain sends focus loss through the focus stack"