Merge "Access mInputDevices with a lock" into main