Merge "Separate TabWidget selection from keyboard focus"