Merge "Fix NPE when attach thumbnail" into main