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