Copied slideshow fix from 3.2  #1557