Merge "Minor changes on AutoFill Save UI."