Merge "Move uinput logic out of jni" into main