bugid-36166: Sprite is hidden when not showing something useful
Merge branch 'bugid-36166' into dev