Merge "Fix issue with split thumbnails overflowing during rotation" into tm-dev