Merge "Fixed name of autofill service on save UI." into pi-dev