Merge "Fix NPE in setActiveTab"