Merge "Pass Device bus ID from native to Java" into main