Merge changes from topic "am-35b1b15f-5b67-4ba5-8be1-803c9e960690"

* changes:
  [automerger skipped] Cancel pending hover tooltip when updating tooltip text. skipped: cef6a2df7c
  Cancel pending hover tooltip when updating tooltip text.