Merge "Ensure that the thumbnail path is valid even without a thumbnail." into oc-mr1-dev