Merge "Change TransitionEffect" into devel/master