Avoid an error when chrome calls us back in-context.

@bug W-1736109@

@rev eric.anderson@
Merging origin/goliver/master-pending-popstack into master