Merge "Do not restore same autofill id twice"