Merge "Update widget picker row logic to resolve cropping" into tm-qpr-dev