Merge changes from topic "presubmit-am-4c8411152aef49f099eee419e063b01e" into sc-v2-dev-plus-aosp

* changes:
  [automerge] Remove popup container drag listener on close complete. 2p: 8aa4b05d22
  Remove popup container drag listener on close complete.