Merge "Fix tab carousel flicker issues"