Merge "Fix focus on wrong tab"