Merge "Prevent view leak in handwriting delegation" into main