Merge "Fixed size of autofill service icon on Save affordance." into oc-mr1-dev