Merge "Consistently multiply touch slop for InputConsumers" into udc-dev