Merge changes from topic "am-56d412af7ece495e9b8fbd6670cc255e"

* changes:
  [automerger skipped] Merge "[DO NOT MERGE]Revert "Edge click and drag using the trackpad shouldn't trigger back"" into udc-dev am: 6bdae608 am: f2dbf561 -s ours
  [automerger skipped] [DO NOT MERGE]Revert "Edge click and drag using the trackpad shouldn't trigger back" am: 59d28689 am: e13a9f8f -s ours