Merge changes I91f41dec,I9a6fccf9 into main

* changes:
  Use scaledTouchSlop for DeviceEntryIconView
  Add addtional logging for long press event handling in the lock screen