Merge "[FileRepo] Avoid performance degeration due to thumbnail requests with a read...