Merge "Minor fixes for autofill-credman integration" into main