Merge "Allow custom buttons in autofill UI" into oc-dev