Merge "Limit preview width to the max chooser width value." into tm-dev