Merge "Correct # of cells estimation that can fit horizontally in widgets picker" into sc-v2-dev