VID-1821 Tweaks to when to show info icon