Fix context change
Merge pull request #2460 from imurchie/isaac-contexts-fix

Fix iOS context switching