Merge "Copy AutofillOptions into derived Contexts"