Merge "Scale the thumbnail if display dimension is different from the actual buffer size"