Merge "Ensured disabled batching reverts to ImageVisual" into devel/master