Merge "Clean up InputDispatcherPolicyInterface" into udc-dev