Merge "Fine tune the Autofill Save UI" into oc-dev