Merge "Load and cache thumbnail with correct user"