Merge "Avoid JVMTI global deoptimization when possible"