Merge "Use split thumbnail width/height directly" into sc-v2-dev