Merge "Fix single field highlighting for autofill." into rvc-dev