Merge "Adds transition effect" into devel/master