Merge "Autofill: refactor out lint warning" into main