Merge "Fix tab switcher in animation"