Merge "Log a proper event when drag-to-maximize" into main