Merge changes from topic "presubmit-am-c81762ef3b084d75afdf183d012bec54" into tm-dev

* changes:
  Add PreferStylusOverTouchBlocker and handle multiple devices
  Remove PreferStylusOverTouchBlocker
  Block touches when stylus is down