Merge "Revert "Prevent double touch inputs in the BaseDragLayer"" into tm-qpr-dev