Merge changes I6811b7b1,I738c0dac into main

* changes:
  Log App Handle drag metrics
  Log Handle Menu metrics