Merge "Add on-device logging for edge resizing" into main