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