Merge "Better error handling for printing out Autofill flags" into main