Merge "Apply WrapMode in animated visual" into devel/master