Bug 903164 - Arguments with an app_context not being pulled off the stack

[merge]