Merge "Respect clip hint when aligning cropped thumbnails." into sc-dev