Merge "Refactor InputWindowHandle JNI code" into main