Merge "Use LinearBlock buffer for thumbnail extraction" into main