Merge "Fix ThumbnailUtils thumbnail pts calculation"