Merge "Update trunk stable flags for autofill" into main