Merge "Make the size of "shirt pocket" 0 when the icon of "shirt pocket" is invisible"