Merge "Always update the thumbnail layer"