Merge "Make fetch thumbnails call on bg thread to reduce thread switching" into main