Merge "Expanded view handle should be the size of the dots" into main