Merge "Revert^2 "[Autofill] : Fix save regression with relayout"" into main