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

Fix iOS context change
fix lint errors