Merge "Actually use texture bounds in CachedSet::getTextureBounds" into sc-dev