Merge "Use GC critical section for profile saver" into oc-dev