Merge "Ignore updating autofill view state to empty if previous value has length > 1" into main