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

Fix iOS context switch