Merge "Crop letterbox insets when thumbnail is from different aspect ratio" into sc-v2-dev