Merge "Revert "Extra common logic of default transition animation"" into main