Merge "Fix potential deadlock in getAutofillOptions()." into rvc-dev