Merge "[Autofill test flag]: Test bug fix flag" into main