Merge "Revert "Make sure both transition start/end callback sent"" into main