Merge "Refactor scanning callback mechanism in JNI layer for GD"