Merge "Fix 5156702: rotate thumbnails"