Merge "Fix Autofill Presentation Events 2" into main