Merge "Add locks to InputDispatcher_test" into rvc-dev