Merge "Removing legacy default thumbnail logic." into oc-dev