Fix iOS context switch
Merge pull request #2444 from imurchie/isaac-contexts-beta

Fix iOS context switch