Merge "Add logging for debugging DeviceEntryUdfpsTouchOverlay" into main