Merge "Update TV Input JNI for TVMessage back compat" into main