Merge changes from topics 'AutofillContext2', 'AutofillContext' into oc-dev

* changes:
  Return all previous FillContexts onFill
  Report multiple FillContext-s onSave