Merge "Remove SerialService JNI layer" into main