Fix if rendering.

@bug W-1775437@

@rev amcculloch@
Merging origin/goliver/master-pending-if-toggle into master