Merge "Set the correct size to the container of icon view" into tm-dev